You may find the Sage 9.1 update branch interesting as this should fix most if not all build/watch issues: