Misc fixes and entries