Fixes for MVP launch