Typofixes and debugging