More bug fixes for crap markup