Two fixes

Both fairly self-explanatory