Fixes (too tired to write commit messages)