Some fixes that makes this work