Small fixes
Sorry for the ugly stuff stuff stuff