Bug Fixes

Thanks, resolved by new commits