Fix media types. Closes #19