Fixes from Whack