Compile 0.401 - Minor bug fixes