Some fixes have been made