Bug fixes to ensure we look at MOSPointSource