A couple small changes to #287 for bug fixes.