Question Mark: Small fixes

Some bug fixes.