Crash fix + constants