Modifications to work in deployed setup.
Fixed compile error.