Making develop mode work properly