Fixes for Marko's bugs.