Few misc fixes