Small changes to make it deployable