Further Bug solves

Further Bug solves