Fixed some HPF stuff