Fix some formate and translation problems