More bugfixes
More fixes to Review