Small tweaks to make it work