More fixes for sim target, fixed compile errors for normal config