Initial commit fixes