Updates and fix