Fixed some minor ghost issues