Identified a few solutions to the problems I identified.