Fixing some errors that were brought over from serial implementation