Code fixes, corresponding format updates