Fix a couple fast issues