Finish solving final issues