Fix more errors
Load/start modules when necessary