Small set of bug fixes again