Various fixes for HTC devices