Some bugfixing after blind programing