fix: Resolve multiple customer-blocking bugs (#126, #131, #132)

fix: Resolve multiple customer-blocking bugs (#126, #131, #132) #1