Some tweaks to make Squeeze boxes work better