MSB-430 and related fix and clean

Depends on the resolution of #310 to compile.