#55: Fixing more bugs