1st round of Small PC bugfixes