More bug fixes

Beta on Fisher for testing