Minor improvements :)