More Compilation Tests and Fixes