Fix numbers 1 and 3 of BJ's reported bugs