A couple fixes. Ports are synced now.
.