manually fix a couple of ports that didn't build yet