Some userbility improvements