Fixing some design issues