Remove fixed positions. Minor fixes