Bugfixes and convenience methods