Fixes for MaybeT
Squash warnings