Fixed minor issues to pass the pedantic model check