Fix Bugs. -Johnson

Fix Bugs.