htpc fixes