Updates to fix issue on Android (Camera working!)