Fix build + format