A couple of fixes related to 375b466