2 bug corrections