Fixes for Unity version 4.5