compile fixes after redesign