Some tweaks to work with real project