Start fixing some of the issues