Fixes more things