Changed version name to 2.1.1-custom
Fixed bugs resulting from interface changes