Fixes and convenience functions