fixes after Starling Merge and minor code fixes