Fixed remaining issues