Start fixing up stuff