Fixes

Small stuff I found while fixing other issues.