Some more fixes for compiling the user dll with -DSTRICT.