Clean up / Stability fixes