Minor, but important fixes!