convenience functions and fixes