Minor updates and convenience functions