Merge "Various fixes"