Bug fixes (Genuinely can't remember)