Small fixes to make everything work with r69