Minor fixes for first prototype