Minor angular fixes