Small Fixes!