Few updates, forgot to split commits