Project Survivor: Fix Minor bugs

Fix Minor bugs