Fixed designtime issues