Partial compile fix