Fixes for some overlooked types/return values