Fixed several ghost issues