WFK2-641, WFK2-633, WFK2-644, WFK2-639

Multiple fixes.