Small Fixes