Requested PR fixes