Fixes n stuff