Minor fixes and stuffto