Minor fixes to previous fix branch