H5: Fix mistakes