[FIX] Some things that were bugging me