Fix a few bugs
Fix a couple bugs