Fixed to build as SL5 project