Various clean ups