Few bug fixes, preparing IA