Simplify HBasePartition variable definition; CriticalPoint fix