Fixes

Simple but important fixes.