Fixing more bugs

Blackbox # 73, 79, 84