Trivial Fixes