Open 311 minor code fixes