Fixes requested by ncla