Multitude of bug fixes