Bodyless bugfixes