Fix last bugs before deploy