Fixing some thigns up