Pushing small fixes