Fixes

Fixed flaws pointed out when validating