Last engineering dock fixes