Pull-request Fixes