Some bug fixes.. nothing issue based