Bugs

Fix a few bugs from IRL tests