Small fixes

Just some small fixes.