Various fixes
1 file changed