Minor non-bug corrections