Fixes that were lying around