DocCode fixes