Fix portlint FATAL errors