Apply fixes

/cc @chancancode