Small Martin changes fixed