Fixed some annoying bugs that Eclipse missed.