More basic bug fixing.