Fix problem with custom title never being used
Fix some strict standards