Small Fixes all around