Fixes #3143 Fixing misc things