Fixed both, see new commits.