Fix more bugs

Signed-off-by: Gleb Aronsky <gleb.aronsky@lexisnexis.com>