Miscellaneous fix on media and workspace