Coding fixes and updates