Fix last problems