Some fixes for the clone view to make it work