Minor fixes for special project