Misc Fix and Error Spotted by bigmap001