A couple miscellaneous corrections

 * Includes trivial filter change