Fix some errors discovered in mid-implementation...