Some more guidelines and fixes