Minor fixes & scheme changes