Some fixes, and media-caf-8226 :)