Fixed some last minute problems