Fix app bootstrap