Add more logging and stderr