Final ports and friendly fixes