Added some bootstrap bits