Fix some bugs introduced by bikeshed
Fix some broken markup from bikeshed conversion