Fixed various regression problems from porting 0.13.1