Initial bug fixes
Initial