Small fixes to support new singnelar