Fixing some slight things that were broken