Fixes, please see commit message