Fix integer multiply warnings
Fix double-null-checks