Added some small generic improvements.