Fixing two issues