Fixes of a small nature