Misc. improvements