Last changes, fix things