Music playing fixes