2 Small Fixes