Misc partinfo changes (ugly)