Fixes from FlixelCommunity