Custom fixes / tweaks
Fixes to run non-gem version