Fixes

A couple of fixes for the previous PRs