fixes for prototype