Updates from the community mantainted version

This might not be enough, but it's worth a try