Hopefully fixed last bugs