* Fix the remaining couple issues