More 1.5.1 updates
Signed-off-by: Steven Downer <Grinch@outlook.com>