Fixing some initial stuff...