final boundary fixes