A few fixes, please update!