More hawkejs changes