Fixed issues with <code>