Bug fixes for SkyC and finished SkyM