Bug fixes with start up features sync