Fixes for some oversights