Little fixes from the last commits.